Autogenerated HTML docs for v1.5.6.2-212-g08b5
diff --git a/git-rerere.html b/git-rerere.html index fab9d72..9c5b43a 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-rerere(1)</title> </head> @@ -272,18 +320,18 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git rerere</em> [clear|diff|status|gc]</p> +<div class="para"><p><em>git rerere</em> [<em>clear</em>|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>In a workflow that employs relatively long lived topic branches, +<div class="para"><p>In a workflow that employs relatively long lived topic branches, the developer sometimes needs to resolve the same conflict over and over again until the topic branches are done (either merged -to the "release" branch, or sent out and accepted upstream).</p> -<p>This command helps this process by recording conflicted +to the "release" branch, or sent out and accepted upstream).</p></div> +<div class="para"><p>This command helps this process by recording conflicted automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same automerge -results and applying the previously recorded hand resolution.</p> +results and applying the previously recorded hand resolution.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -294,19 +342,19 @@ </tr></table> </div> </div> -<h2>COMMANDS</h2> +<h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> -<p>Normally, <tt>git-rerere</tt> is run without arguments or user-intervention. +<div class="para"><p>Normally, <em>git-rerere</em> is run without arguments or user-intervention. However, it has several commands that allow it to interact with -its working state.</p> -<dl> +its working state.</p></div> +<div class="vlist"><dl> <dt> <em>clear</em> </dt> <dd> <p> This resets the metadata used by rerere if a merge resolution is to be -is aborted. Calling <tt>git-am --skip</tt> or <tt>git-rebase [--skip|--abort]</tt> +is aborted. Calling <em>git-am --skip</em> or <em>git-rebase [--skip|--abort]</em> will automatically invoke this command. </p> </dd> @@ -318,7 +366,7 @@ This displays diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving conflicts. Additional arguments are passed directly to the system -<tt>diff</tt> command installed in PATH. +<em>diff</em> command installed in PATH. </p> </dd> <dt> @@ -326,7 +374,7 @@ </dt> <dd> <p> -Like diff, but this only prints the filenames that will be tracked +Like <em>diff</em>, but this only prints the filenames that will be tracked for resolutions. </p> </dd> @@ -343,22 +391,22 @@ variables. </p> </dd> -</dl> +</dl></div> </div> -<h2>DISCUSSION</h2> +<h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<p>When your topic branch modifies overlapping area that your +<div class="para"><p>When your topic branch modifies overlapping area that your master branch (or upstream) touched since your topic branch forked from it, you may want to test it with the latest master, -even before your topic branch is ready to be pushed upstream:</p> +even before your topic branch is ready to be pushed upstream:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> o---*---o topic / o---o---o---*---o---o master</tt></pre> </div></div> -<p>For such a test, you need to merge master and topic somehow. -One way to do it is to pull master into the topic branch:</p> +<div class="para"><p>For such a test, you need to merge master and topic somehow. +One way to do it is to pull master into the topic branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git checkout topic @@ -368,17 +416,17 @@ / / o---o---o---*---o---o master</tt></pre> </div></div> -<p>The commits marked with <tt>*</tt> touch the same area in the same +<div class="para"><p>The commits marked with <tt>*</tt> touch the same area in the same file; you need to resolve the conflicts when creating the commit marked with <tt>+</tt>. Then you can test the result to make sure your -work-in-progress still works with what is in the latest master.</p> -<p>After this test merge, there are two ways to continue your work +work-in-progress still works with what is in the latest master.</p></div> +<div class="para"><p>After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge -commit <tt>+</tt>, and when your work in the topic branch is finally +commit <tt><tt></tt>, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you. By that time, however, the master or -the upstream might have been advanced since the test merge <tt>+</tt>, -in which case the final commit graph would look like this:</p> +the upstream might have been advanced since the test merge <tt></tt></tt>, +in which case the final commit graph would look like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git checkout topic @@ -391,15 +439,15 @@ / / \ o---o---o---*---o---o---o---o---+ master</tt></pre> </div></div> -<p>When your topic branch is long-lived, however, your topic branch +<div class="para"><p>When your topic branch is long-lived, however, your topic branch would end up having many such "Merge from master" commits on it, which would unnecessarily clutter the development history. Readers of the Linux kernel mailing list may remember that Linus complained about such too frequent test merges when a subsystem -maintainer asked to pull from a branch full of "useless merges".</p> -<p>As an alternative, to keep the topic branch clean of test +maintainer asked to pull from a branch full of "useless merges".</p></div> +<div class="para"><p>As an alternative, to keep the topic branch clean of test merges, you could blow away the test merge, and keep building on -top of the tip before the test merge:</p> +top of the tip before the test merge:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git checkout topic @@ -413,45 +461,45 @@ / \ o---o---o---*---o---o---o---o---+ master</tt></pre> </div></div> -<p>This would leave only one merge commit when your topic branch is +<div class="para"><p>This would leave only one merge commit when your topic branch is finally ready and merged into the master branch. This merge would require you to resolve the conflict, introduced by the commits marked with <tt>*</tt>. However, often this conflict is the same conflict you resolved when you created the test merge you -blew away. <tt>git-rerere</tt> command helps you to resolve this final +blew away. <em>git-rerere</em> command helps you to resolve this final conflicted merge using the information from your earlier hand -resolve.</p> -<p>Running the <tt>git-rerere</tt> command immediately after a conflicted +resolve.</p></div> +<div class="para"><p>Running the <em>git-rerere</em> command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> in them. Later, after you are done resolving the conflicts, -running <tt>git-rerere</tt> again records the resolved state of these +running <em>git-rerere</em> again records the resolved state of these files. Suppose you did this when you created the test merge of -master into the topic branch.</p> -<p>Next time, running <tt>git-rerere</tt> after seeing a conflicted +master into the topic branch.</p></div> +<div class="para"><p>Next time, running <em>git-rerere</em> after seeing a conflicted automerge, if the conflict is the same as the earlier one recorded, it is noticed and a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge is performed by the command. If this three-way merge resolves cleanly, the result is written out to your working tree file, so you would not have to manually -resolve it. Note that <tt>git-rerere</tt> leaves the index file alone, +resolve it. Note that <em>git-rerere</em> leaves the index file alone, so you still need to do the final sanity checks with <tt>git diff</tt> -(or <tt>git diff -c</tt>) and <tt>git add</tt> when you are satisfied.</p> -<p>As a convenience measure, <tt>git-merge</tt> automatically invokes -<tt>git-rerere</tt> when it exits with a failed automerge, which +(or <tt>git diff -c</tt>) and <em>git-add</em> when you are satisfied.</p></div> +<div class="para"><p>As a convenience measure, <em>git-merge</em> automatically invokes +<em>git-rerere</em> when it exits with a failed automerge, which records it if it is a new conflict, or reuses the earlier hand -resolve when it is not. <tt>git-commit</tt> also invokes <tt>git-rerere</tt> +resolve when it is not. <em>git-commit</em> also invokes <em>git-rerere</em> when recording a merge result. What this means is that you do not have to do anything special yourself (Note: you still have -to set the config variable rerere.enabled to enable this command).</p> -<p>In our example, when you did the test merge, the manual +to set the config variable rerere.enabled to enable this command).</p></div> +<div class="para"><p>In our example, when you did the test merge, the manual resolution is recorded, and it will be reused when you do the actual merge later with updated master and topic branch, as long -as the earlier resolution is still applicable.</p> -<p>The information <tt>git-rerere</tt> records is also used when running -<tt>git-rebase</tt>. After blowing away the test merge and continuing -development on the topic branch:</p> +as the earlier resolution is still applicable.</p></div> +<div class="para"><p>The information <em>git-rerere</em> records is also used when running +<em>git-rebase</em>. After blowing away the test merge and continuing +development on the topic branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> o---*---o-------o---o topic @@ -464,24 +512,24 @@ / o---o---o---*---o---o---o---o master</tt></pre> </div></div> -<p>you could run <tt>git rebase master topic</tt>, to keep yourself +<div class="para"><p>you could run <tt>git rebase master topic</tt>, to keep yourself up-to-date even before your topic is ready to be sent upstream. This would result in falling back to three-way merge, and it would conflict the same way the test merge you resolved earlier. -<tt>git-rerere</tt> is run by <tt>git-rebase</tt> to help you resolve this -conflict.</p> +<em>git-rerere</em> is run by <em>git-rebase</em> to help you resolve this +conflict.</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Junio C Hamano <junkio@cox.net></p> +<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:59 UTC +Last updated 2008-07-06 05:16:59 UTC </div> </div> </body> 